Some new buy tools, bug fixes
merging