Added device detection + minor changes