#13 #12 #11 misc changes