updated comments and whatnot