debugging and UI improvements