Changes on feedback

Changes on feedback from @cpennington and @singingwolfboy