Final fixes for #9

When I check that it works out, I will close the issue :d