clean up #setup!
make :as a dynamic option, too.
add changes.