important fixes