moved some things back to custom.el