Fix tail attachment in (...) groups and misc. adjustments