minor style fixes
add sourcemap
Merge branch 'develop'