3rd batch of bug fixed
3rd batch of bug fixed
4th batch bugs fixed