fixing that and the other things I commented on while merging.... just running tests on that now