Lomboking some things and various cleanups