Fix more symbols and some refactor