tracked down some more issues