misc edits
improve hasUncountable
hasUncountable optimisation
misc optimisations and tidying