some fixes + more responsive support