snooplion as well as a few minor changes