Bug fixing and improved arch design