v0.2.5.1

Various small changes, more in-depth todo list in Main