Bugfixes, this actually works on a PI!!