Clean up, prep for first release