Finished fixing things