minor changes
Lots of clean-ups