ToDo fixes and website sync