Fixed All Bugs