fixed some things, i think?