Many GUI updates and changes to OSDataCollection in prep for API