misc cleanups
Merge branch 'working'