Implemented the shallow backup + a bit of tweaking and refactoring never hurt anybody. Hunted down a few bugs too.