Severall Bug Fixes