major bugs solved, numbering working until 3.5.20