Fixed a lot of things and made some changes.