changes to try to make it compatible, reduced ot just compiler time errors now (nasty)