fixed notice / added todo