More syntax and regex fiddling