dev -> master merge

nothing significant, just small progresses made here and there