fixed more issues