some fixes + 5.4