better structs, comment cleanup, reordered sections