Deposit improvements + minor fixes

Merges pull request #133