Updated everything with up to date and correct information