more semantic/ac interplay tweaks