Removed NoInterfaceObject (per f2f discussion)
Fixed links
Fixed markup