Fix bugs divers/simplifications