Fixed bugs found in manual testing