4.3 preparations

bug fixing
clean up