Fixed javadoc, added missing @Overrides

I accidentally deleted this

I'm tired, I screwed up a few things

I'm tired, I screwed up a few things
Merge pull request #97 from zeuslightning125/master

Fixed existing javadoc, added missing @Overrides