some fixes, don't know