marcelo's full review fixes.