Some help from Hussain to clean up controller and then I fixed listing notes