better debug support, starting on it...