massive debug yet, but more solid