[fix] for a lot of minor issues