Minor improvements + partial note support
Merge branch 'master' of https://github.com/sevenfivenine/AdvertisementDatabase