some of the return-value related minor bug is fixed.