Burn more code, fixing some specs