updated - a few more fixes