1. fix some bixs