Bug Clean Up