specific + small fixes