Added better logging and user feedback