fix collocation, and other things