fixed two bugs. it's getting nastier