Better filling

One of the commit is huge but it just reorders a few functions.
MIght be easier to read commits one by one.

Don't fill headlines or html comments. 
Also refactor the skipping functions to be cleaner