added todo's  and made minor changes