Major design changes and added better author support