Revert "Revert "Few small changes!""

This reverts commit df57f7c4ac4375f56abcf0f9b15f98087133ee96.
Downloaded david_dev från github.com