Some minor updates throughout