tweaks and aded custom comments