Fixes and introduced localisation