some small fixes, and converging setup