fixed some stuff
merge branch testing
small changes