Add some minor touhes :)