fixed more issues

still not working though