added some pkgs, moved some around, some finance edits, closes #38, closes #39, closes #41, closes #42