Minor updates
Add automatic pruning!