Add debug, fix hyphens