Carter Rabasa small tweaks