tweaked some stuff
added some fixes