Upstream

Little fixes & new component