Few minor changes and updates