finish the right management and fix some little mistakes