more updated

more updated, still not building.