moved stuff around
fixed errors