fixes after debugging