several fixes now