small tweaks making everything more stable