Added some size hints a