Fixes #7 and adds a few others.