some small features & fixes