Cleanup, and finally really able to do things...