Simplifying, renaming, etc; ready for preliminary results