Few fixes for 2.1

Here are all changes I made so far (including those previous ones). I have to figure out how to properly use git and understand branches, so I can create pull request for each fix I make. Those git commands, it's like chinese to me >.<