added a regulator, and made some other edits