Add specs, squash exposed bugs