Final review of SoM and Train Trip vs 4.6 +added two spec issues