Fix formatting, add missing files
Fix wrong length constans