some more fix and update