Cleanup, fixes, fun