Added some more todos, changed line-length reccomendation