Add Standalone; clean up other stuff a bit.