Conclusion + some other fixes