annnnd porting in local edits from the raspberry pi