fixed...everything?