Adds the since parameter
Minor code cleanup and minor tweaks.