Design fixes.

Fixed #33