getting fixes #15 and #19 out