Conclusion fixes + quick read-through