More minor updates..