some fixed some broken.