fixed a few more issues