minor fix and whatnot