stuff from friday build/minor fixes