Revert "Revert "few minor changes""

This reverts commit 28caa1b091654f888673f52ba99bf3bb4800f2a5.