Adding some comments and catch devices w/o gUM