Updates and final commits