Polishing up all the borders
Final additions pre-crit