fix bugs and texts