fixes and add new files