Fixed some minor bugs

Fixed some minor bugs and have started work on the project again.