Finished update

Update now is fully functional, did preliminary testing.