Small fixes, cleanup, and presentability changes.