WHAT: Maveninze, make it compile, & other cleanup