Reduce logging, addtional testing & bug fixing