added last tweaks