depends and minor fixes #1 #3