oops, many fixes