Various Changes

.
.

.