some things fixed, some broken again