Fix bugs and updated feedback messages.