added few tweaks.