Added @task command + other fixes