apply quick fix to remove <> warnings
add missing @Override annotations
translate code from spanish to english