Ironing out some bugs, temp debug statements