update changes to match video
fix crash when adding transaction (debug build only)
Merge pull request #104 from siena123/master

update changes to match video