--many fixes: not functional yet