some fixes, as usual