A few changes, please revert if you don't like it :P