Modified chapter and section labels

mainly to allow sections with the same
name as chapters.