Updates and clear ups