minor corrections, additions and file structure modifications