custom improvements

Thanks for the project. I'm building my inventory on it.
Please review and cherry-pick (or merge) as you wish.