overall fixes & small improvements