Added ToDo + Minor Fixes