FiniChanging some things in the code to fix a few bugs