Various updates.  NOTE: not a stable update, but need to push changes to PC