Bug fixes and added other ATC to map.