Add comments, dep's and optimized tasks