Bunch of changes, nothing new.
 - de-onelined true and false
 - added '--' argument to some utils
 - shortened some other code
I guess that's all.