- some bug corrections and improvements