minor improvements and todos task