Corrected Many Bug Fixes