Cleanup; more features. WIP.