minor fix and updates