Updated TO-DO and small fixes