Conclusion and fixes