Added more of vdsilva's suggestions.