various 201403 issues/improvements