some geraet fixes
some geraet fixes