some important fixes