small fixes on coding