fixed two moving bugs
merged shit