-more fixes