Generater cleanup
Data/Walking updates