tweaking some settings, starting a refactor