#12 and misc other changes