added some of the fixes as suggested by the other guys (and girls)