Making all da things not required.
Small updates.