Fixes

- Also removed some debugging