Improve project stuff