Update and tweaks for raspberry pi version