Lots of bug fixes, some very bad things were happening :(
Updated for release