fixed bugs occuring from last commit