Magcon Edits

by @MattsAnaconda

MattsAnaconda