Cleanup notices a little -- still not imlpemented yet
Fix inventory queries