Fix strings allocations
Fix comments