8th batch of bugs fixed