Updates yagui + small clean up