Cleaned up tasks a bit
Adding links