added excavate. did some source cleaning.