fixed tom's compiler errors