Updated comments, flashing error messages.