Cleaned up chapter numbering
Added references