Moved some things around, added some missing calls