Cortex and init tuning/cleaning.
Merge remote-tracking branch 'dorimanx/master'