bug fixes through out the app