Various updates, cleanup time