Usage and TODO updated