some edits ;)