Typo, testing and bugfixing on RPi.