update

from last friday - bug fixes