cleaned up and added missing symbols