Misc web service cleanups, fixme fixes, and javadoc improvements