extended paramterization and reduced use of makers to test error results
cleaned extensively in preparation for story 2