- various fix