some slightly "cool" improvements ;)