more various tweeks