some fixes + added zf console