solving more issues
I think its done