minor org improvements