added new files. fixed bugs