some todos added from time to time