fix for huge amount of text
added a bit more todos