more important fixes