Options added, AddAcc fixed, updated TODO