small changes
fixes minor bugs