Develop - fixed bugs found during testing