fixing details and moving things around.