godville 0.4.6 some little refectoring