a lot of small fixes after first manuel test