fixing stuff
almost done
Final Fix, stable version now