Weekly mods 11-15

furthering adjustments to meet spec. might have another push late
tonight