fixed some stuff
allmost