check for primitive fcns, other tweaks