fix contrast headache
various fixes