minor tweeks
more stuff