no real functionality changes, just moving some things around and updating some doc