Major bug fixes, more to come :>