#64 separated into separate commits for the different bugs...