A few things I found out of place but a quick recapp