debug draw + more fixes; crash on commit