fix arch
fix all handling
ideas.