Added numerous changes from embeejay