Updated to include outstanding PR's and website required tweaks