big update... still lots todo