Add and fix some