oops some fixes