end of the day commit. Fixed several minor bugs