Cleaned up code

cleaned up code
decided that device names are a bad idea
Updated version and docs