Added functionality, squashed bugs, tied up loose ends,