Comment out WIP stuff, fix a few things