More fixes
added more files