minor updates + bug fix