Added items from Laureano's feedback