Removed TODOs. Updated JavaDoc. Some minor changes