Episode 31

Finnishing the serie and some small bugfixing