finished conclusions

also retouched conclusions and discussions