added todo, cleaned up old items