some cleanup and todos