Passing all but 2 section specs, doing well
Fix some issues