fix some crap