Angus talk and some very little tiny fixes