fixed some things
v6