Update

Settings are now fully implemented