Fixes and updates - still incomplete.