removed some extraneous variables
x
good stuff
lots of useability improvements