v.0.6.3
some edits