removed some of DM's stuff. changed header files, cleaned up device file a little