Cleanup
Unsigned char fix, removed debug