various fixes - back to 15 pages