cleaned up includes and errors
created multimap for devices and windows