many fixes after siscog