'scalar' now propogates type, various u1 support bug fixes