Some changes to .sections and other various fixes