Some important fix and view