4.3 preparations

code cleanup
bug fixing