added a few suggestions for PaulMatos