few presentational changes
fix conflict