Little updates and a little TODO list