Updates from Last Night

Just some more changes to the files