fix redirection bug, refactor translation message, some cleaning