Cleanup and stuff for alpha release

Good enough!