small fixes, improvements... to be continued