qualified symbols and a lot of fixes