More sniipets and little fix