Fixes from March class, code updates, all minor changes