final amendments
fix consistency