Fixed a lot!