fix and fix bugs..