more fixes some problems