Fixed...everything