Updated/refactored a couple of things.