update to the latest bikeshed; fix markup errors