A few changes + additions.