Updated to make me happier

  * Bunch of small things