LOTS of cleanups in prep for an alpha release