Fixed?
merged ryan's fixes