minor fixes [still unwork]