Merge of Centered fork -- Implemented centered mapping with credit; bug fixes