fixed several more issues