Correct javadoc
Removed some compiler warnings by adding serial version IDs and removing
bogus annotation