minor bugs and improvements