Fix looooads of minor bugs
Support weird branch syntax in git