minor fix and improved