oops, some fixes