solving minor bugs , overall enhance improved