some fixes (but things broken yo)