reduce files, add funcs
micro fixes
Merge branch 'release/0.3.1'