Fixes and update the src to the latest version