fixed some final bugs and updated new files