improved debugging
improved debugging