made various tweaks