Added @Overrides annotation and minor fixes