Fix tab echo
Include small todo
Use new seperator
A lot more sane matching
Update pkgbuild