first local checkin
various updates
not tested against python 3.2