Some updates , minor fix