Posts and comments

Think I messed up some of my commit messages and one of the merge conflicts, but I get it now, so no worries.