fix significant problems  ;)