added todo features 2 and 7, fixed issue #1