cleaning up
more cleaning
changed names of libraries to accomodate changes in TRM's code
more cleanup