hotfix typos
re#62 Some reformatting, reworking