fixed 7th batch of bugs