Cleanup, correct units in the comments, add data labels, remove unused code
Merge branch 'master' of https://github.com/kktse/uwfm