Add support for note and category upload for Contacts

* Also fixed a few random bugs found while debugging
3 files changed