more fixes, improvements