fix up dependencies Fixes #20 #21