cleanups
migrated some stuff from blow