tweaks and verbose error messsages