Added prunning and some other goodies.