Feature/verboseids

Pulls in changes from #30 as well as some code cleanup. Due to nature of change, #35 is also merged into this.