Cleanup, bug fixes