Fixed a lot of things, this is release candidate gold