minor changes to some files
changes to cmake to get it running on LANL desktop