add set on boot and rename some things