added some todo markers
fixed some titles