General update

General update and Mod 4 hawk completion.