Fixes via todo and adds basic bit.ly support