Adding support for +5 extensions, fix tab/whitespace