some corrections to previous commit from nostromo