Dev several improvements