fixed several things, everything works!