fix few more bugs and small change request