[feature030] some fixes