Cleaned up the Code a bit

Removed unused imports

Added @Override to a couple of arreas

fixed a string comparison as well as making the check for TEXT or META arguements case-insensitive since its made to be all uppercase anyhow.