MANY Bug Fixes