add and fix some