Minor nits.
Major rework to get new ports and functionality fixed.