Added new files and some fixes