move things around, other minor changes