work on actual client
fix localisable warnings