[^] some fixes