fixed suborder save issue and other variable name issues