src:fixed some extra bugs