more work on layout diagram, testing sketch updated