Fixed All Errors

All progress currently being made by Nachoz