review fixes: imports, typos, little fixes