More tweaks

Clean up, making things work.