more little bugs fixed