fixed various thing I broke with the last commit