- Fixed some "Indian Hard-coded Code"