Fixed a lot of things....