solved 24, added 25 incomplete, minor update to 3