Updates to settings & parts