more fixes/problems