Cleaned things up. Mostly happy with it.

:)