Removed user prompting an fixed small bugs