fixed a bug & moved stuff around heavily.