Major updates and added sections