update few more stuff but not completed...