fixes #40

Items in the database are now coalesced instead of some weird bug-driven
kinda method...
And some other small fixes and enhancements