V.0.0.11: Cleaned up debug and a couple v16 errors