Fixes Specs.

Fixes #74
Fixes #73
Fixes #58