Various code updates and implementations.