Primarily JavaDocs, minor change to how invalid keys are handled

Signed-off-by: Ollie <dzineit@live.co.uk>