Add brightness + a few tweaks and tidying up