random tweaks and consistency fixes