Refine structure
Update references
Remove weird HTML outputs
Update main text