Updated a lot of stuff

Signed-off-by: Mattijs Korpershoek <mattijs.korpershoek@gmail.com>