added, num needs test, smaller fixes