Small up. Fix small errors. Cleanup.