updated calcs, updates forms, small layout upds