First personalisation and bug fixes