Added CTP
minor fix to do lat/lon index wrapping