updated with some finance pkgs, closes #16, closes #17