Refactors and optimizes specs; starts to work on feats.