Fixed problems with ModelMecha edits