added todo note and comment fix