typos and module calls corrected