Fix Major Issues