Improve visibility of source and fixe some error