Added intensity option, fixed width issue