Closes #119; got rid of diagnostic output