Fixed it all up :)