Some more cleanups for V0.02
Merge branch 'working'