Cleanup, first draft of alpha build now completed