fixing some errors and updating texts