Various updates and cleanup. Trying out vanilla speedbar.