Adding @Override and @Deprecated tags where applicable

Most were added automatically using Eclipse
Fix #219

Convert GroupType to an enum.