cd matcher, alias line matcher and fixes to a few things