Updated some shiz and moved some shiz around.