fixed several minor issues reported by Esben.