bugfix resolutions
handle tape device a bit better
Merge branch 'master' of github.com:jscrane/UK101-Energia