fixed a couple of the issues from #100