Edited Various things