Edited volume and tweaks to debugs