updated to be in sync w/ spec 0.4.5.1

and other clean-up.