Fixed thanks bugs
merged