fixed some stuff as a result of breaking stuff while fixing stuff