Add doc-block and fix carrier name
Fix bugs

It's working now.