fixed and added new files and code