General Update

Just to be as updated as the actual branch.