cleanups + working config