added wizard and other stuff, also some fixes here and there.