Updating Logic and removing comments from lastblockjob and watchpayments