Add Feedback and Improvements from @PrometheusPi

Thanks Richard! :)