fix some last commits