Fixed some... but not ALL