fixed bugs, added new files