closes #119 and closes #121 and refs #120