added some bells and whistles. other things are still crap though.