Some small changes [Added @Override Annotations, ...]