* Eliminated a bunch of errors