Made some more changes to the basic stuff.