more fixes, debugging