tweaked a bunch of stuff -smd