Bugfixes and pretty tiny features

Title and changes say more than this comment could.