Some updates and adjustments according to conversations