bunch of important fixes but nothing special