Some small commits

I feel stupid making pull request for these but I didn't want to throw these few lines away, yet, I don't want to have them hanging in my working copy. Actually I thought there would've been more commits but I threw most of them away.