fixed some screwballery