Minor fix
Further fixes & improvements