fixed some things that got changed before