some other bug fixes