celebrity data persistency and small fixes