Fixed a few things and uupdated some key elements