Various bugfixes: TODO Check the CSL because things seem to be missing