Fixed device models
Added comments