nick - more fixes