less changing of filenames.  just sticking to scheme.hs
added error handling features