added various tweaks