bug fixing
misc change