fixing more issues