Some further improvements and cleanups of this new chapter. Secuity bugs
now have a procedure defined