Em Andamento

Some fixing in WP