Some changes based on comments
Fixing some specs, but others still broken