a few more edits and beautification