Various updates
More updates! Yay!