fixes, cleanup, bump