try to avoid sharp bend as much as possible and minor fixes