- some bug fixing