Fixes; tweaks to behavior