Polishing

Improvements, bug fixes, clean-up, etc.