fix found bugs while testing the app