Minor bugfixes, improvements and changes across the board.