Some cleaning up. Starting with documentation tomorrow, and hopefully I
will be able to make it work completely.