some small changes to CYO, layout, pulling Qs, etc. Nothing major