Bunch of small changes (also see trello board)