-More minor updates