Improved wc -> watercesso and others ;)