Add some todos
Fix README a bit