[fix] more bugfixes.