Contains Fixes

Updated to contain previously posted fixes from
http://n3u.com/projects/n3u_niche_store/n3u-niche-store-14-02-20-now/