Merged bug fixes from 0.2dev pagd.
Fresh rendering.