small fixes and update on Conclusion