Minor improvements. Thanks nogal :P