more fixes

fixed some problems