Cleanup, Flash fix, version bump