updates to code combat solution and gps1.2 solution