minor remodeling for propulsion platform
bug fix and merge with office work