Added juicy new options and documentation