Cleanup, comments, and another rpi compiler error