Added some new features.
Fixed update error message