Fix Major Bugs