last fixes based on ccheck output. good night.