merging some bugfixes in HWInterface from Dev Branch