some major changes

everything works now!