EXPERIMENTAL: Small improvements here and there
several amendments