Validator progress and general cleanup