Added some temp debugging stuff and temp quickfixes