Huge update to 1.5.2