Fix minor bugs with commenting and tasks