new rupture scaling and floating enums and other minor edits