moved some things to settings