Fixed a few bugs and added isA backrefs