Updates for current co-op term and previous study term. Tweaks and some trimming