Put rpi stuff in rpi section, minor tweaks.