small fixes, cleanup
Merge origin/master