#7 Fixed remaining pivot issues
#7 Temp. logging cleanup