some fixed, still need more