cleanups, fixes, more sexification