fixes after user feedback