Updated what needed changes. Contains one build error.