improve contributions & minor tweaks