bug fixes to make sure project is working