various code updates.