fixing up master after last merge