small fixes and todos