fixes after manual testing