fixed issues, not all :/