Bug fix and aired out spacing policies