several updates/improvements