Fixed some things after testing.