removal of the patches and better packaging after improvements suggested by wiz@