fixed some more issues
finally works