moved stuff around and cleaned it up a bit