Did some debug fixing and changes stuff