Various code update...