fixed bugs, added new ones