couple minor fix and updates