fancy debugging and other...changes