Multiple improvements in Tortazo v1.1