massive ocaat --> asteca change + minor fixes