fixed some things

still not working completely, fix a little though.