minor improvements and todos