Bunch of comments, changes, improvements