Second raft of Jeff Changes

Second set of changes from Jeff Stephens after finding errors when
loading into Revit.