adding assertion type rule
fixing symbol names
various fixes