fixing some crap