more fixes, not functional yet