update for bug-fixes