Some fixing and moving around.