w+ more indent fixes