archive fixed, small cleanup