Few more edits (I think, can't remember, really)