fixes after debug