[feature031] some fixes