improve everything
tweaks