Added a partner list
Fixed include guards
Minor updates, cleanup