and PS5 file and small tidy up